From acbb0c4bddc2839d225db3ca8640c1fec94b0b78 Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Wed, 24 Feb 2016 13:24:14 -0500
Subject: [PATCH] mir: fix warnings

---
 gdk/mir/gdkmir-debug.c      | 16 ++++++++--------
 gdk/mir/gdkmir-private.h    | 10 ----------
 gdk/mir/gdkmireventsource.c |  5 ++---
 gdk/mir/gdkmirwindowimpl.c  |  4 +++-
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
index 68e0f14370..7dd54d5cb7 100644
--- a/gdk/mir/gdkmir-debug.c
+++ b/gdk/mir/gdkmir-debug.c
@@ -17,7 +17,7 @@
 
 #include "gdkmir-private.h"
 
-void
+static void
 _gdk_mir_print_modifiers (unsigned int modifiers)
 {
   g_printerr (" Modifiers");
@@ -58,7 +58,7 @@ _gdk_mir_print_modifiers (unsigned int modifiers)
   g_printerr ("\n");
 }
 
-void
+static void
 _gdk_mir_print_key_event (const MirInputEvent *event)
 {
   const MirKeyboardEvent *keyboard_event = mir_input_event_get_keyboard_event (event);
@@ -147,7 +147,7 @@ _gdk_mir_print_touch_event (const MirInputEvent *event)
     }
 }
 
-void
+static void
 _gdk_mir_print_motion_event (const MirInputEvent *event)
 {
   const MirPointerEvent *pointer_event = mir_input_event_get_pointer_event (event);
@@ -199,7 +199,7 @@ _gdk_mir_print_motion_event (const MirInputEvent *event)
   g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
 }
 
-void
+static void
 _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
 {
   g_printerr ("SURFACE\n");
@@ -226,15 +226,15 @@ _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
   g_printerr (" Value %i\n", mir_surface_event_get_attribute_value (event));
 }
 
-void
+static void
 _gdk_mir_print_resize_event (const MirResizeEvent *event)
 {
   g_printerr ("RESIZE\n");
   g_printerr (" Size (%i, %i)\n", mir_resize_event_get_width (event), mir_resize_event_get_height (event));
 }
 
-void
-_gdk_mir_print_close_event (const MirCloseSurfaceEvent *event)
+static void
+_gdk_mir_print_close_event (void)
 {
   g_printerr ("CLOSED\n");
 }
@@ -275,7 +275,7 @@ _gdk_mir_print_event (const MirEvent *event)
       _gdk_mir_print_resize_event (mir_event_get_resize_event (event));
       break;
     case mir_event_type_close_surface:
-      _gdk_mir_print_close_event (mir_event_get_close_surface_event (event));
+      _gdk_mir_print_close_event ();
       break;
     default:
       g_printerr ("EVENT %u\n", mir_event_get_type (event));
diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
index 2464434ec9..84051a7ed7 100644
--- a/gdk/mir/gdkmir-private.h
+++ b/gdk/mir/gdkmir-private.h
@@ -121,16 +121,6 @@ EGLSurface _gdk_mir_window_get_egl_surface (GdkWindow *window, EGLConfig config)
 
 EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig config);
 
-void _gdk_mir_print_modifiers (unsigned int modifiers);
-
-void _gdk_mir_print_key_event (const MirInputEvent *event);
-
-void _gdk_mir_print_motion_event (const MirInputEvent *event);
-
-void _gdk_mir_print_surface_event (const MirSurfaceEvent *event);
-
-void _gdk_mir_print_resize_event (const MirResizeEvent *event);
-
 void _gdk_mir_print_event (const MirEvent *event);
 
 #endif /* __GDK_PRIVATE_MIR_H__ */
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index 8671dddfcb..a288cb798d 100644
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -537,8 +537,7 @@ handle_resize_event (GdkWindow            *window,
 }
 
 static void
-handle_close_event (GdkWindow                  *window,
-                    const MirCloseSurfaceEvent *event)
+handle_close_event (GdkWindow *window)
 {
   send_event (window, get_pointer (window), gdk_event_new (GDK_DESTROY));
   gdk_window_destroy_notify (window);
@@ -596,7 +595,7 @@ gdk_mir_event_source_queue_event (GdkDisplay     *display,
       // FIXME?
       break;
     case mir_event_type_close_surface:
-      handle_close_event (window, mir_event_get_close_surface_event (event));
+      handle_close_event (window);
       break;
     default:
       g_warning ("Ignoring unknown Mir event %d", mir_event_get_type (event));
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 6272690645..5ca9d89511 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -1152,7 +1152,9 @@ gdk_mir_window_impl_register_dnd (GdkWindow *window)
 static GdkDragContext *
 gdk_mir_window_impl_drag_begin (GdkWindow *window,
                                 GdkDevice *device,
-                                GList     *targets)
+                                GList     *targets,
+                                gint       x_root,
+                                gint       y_root)
 {
   //g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window);
   return NULL;
-- 
2.30.2